(fontset_find_font): Check if rfont_def is Qnil or not.

diff --git a/src/fontset.c b/src/fontset.c
index 3eb835401f242d89638caae2ee7cfd39d465d210..bd9f719423abe3aab539338609da655632d4ed8b 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -547,8 +547,11 @@ fontset_find_font (fontset, c, face, id, fallback)
        for (i = 0; i < ASIZE (vec); i++)
          {
            Lisp_Object rfont_def = AREF (vec, i);
-           Lisp_Object repertory
-             = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
+           Lisp_Object repertory;
+
+           if (NILP (rfont_def))
+             break;
+           repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def));
 
            if (XINT (repertory) == id)
              {